0a1d47795faee89a3be33c92d525aadc22bdeca0,opennms-services/src/main/java/org/opennms/netmgt/config/UserManager.java,UserManager,getContactServiceProvider,#User#String#,281

Before Change


        if (user == null)
            return "";
        String value = "";
        Enumeration contacts = user.enumerateContact();
        while (contacts != null && contacts.hasMoreElements()) {
            Contact contact = (Contact) contacts.nextElement();
            if (contact != null) {
                if (contact.getType().equals(command)) {
                    value = contact.getServiceProvider();
                    break;
                }
            }
        }
        return value;

After Change


        return getContactServiceProvider(user, command);
    }
    
    public String getContactServiceProvider(User user, String command) throws IOException, MarshalException, ValidationException {
        update();
        
        if (user == null)
            return "";

        for (Contact contact : user.getContactCollection()) {
        	if (contact != null && contact.getType().equals(command)) {
        		return contact.getServiceProvider();
        	}
        }